auto merge of #222 : alexcrichton/cargo/no-cargo-toml-in-target, r=wycats
authorbors <bors@rust-lang.org>
Mon, 21 Jul 2014 15:59:39 +0000 (15:59 +0000)
committerbors <bors@rust-lang.org>
Mon, 21 Jul 2014 15:59:39 +0000 (15:59 +0000)
When cargo is building itself, it just ends up getting confused because the test
directory is in this location.


Trivial merge